From e424176199645c2179173224366b280a0d8ba988 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Marco=20Trevisan=20=28Trevi=C3=B1o=29?= Date: Mon, 19 Jul 2021 17:49:47 +0200 Subject: [PATCH] debian: Add support for libcloudproviders in debian While keep this disabled for ubuntu and derivatives as it's not in main repo. --- debian/control | 1 + debian/control.in | 1 + debian/rules | 6 +++++- 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/debian/control b/debian/control index 8f5c4a0014..0c2b65221c 100644 --- a/debian/control +++ b/debian/control @@ -22,6 +22,7 @@ Build-Depends: adwaita-icon-theme , libavutil-dev (>= 7:4.1.0), libcairo2-dev (>= 1.14.0), libcolord-dev (>= 0.1.9), + libcloudproviders-dev (>= 0.3.1), libcups2-dev (>= 2.0), libegl1-mesa-dev [linux-any], libepoxy-dev, diff --git a/debian/control.in b/debian/control.in index 3d0b8b270d..c16c70f98f 100644 --- a/debian/control.in +++ b/debian/control.in @@ -22,6 +22,7 @@ Build-Depends: adwaita-icon-theme , libavutil-dev (>= 7:4.1.0), libcairo2-dev (>= 1.14.0), libcolord-dev (>= 0.1.9), + libcloudproviders-dev (>= 0.3.1), libcups2-dev (>= 2.0), libegl1-mesa-dev [linux-any], libepoxy-dev, diff --git a/debian/rules b/debian/rules index 9ffa7f3470..8c57f7146e 100755 --- a/debian/rules +++ b/debian/rules @@ -81,7 +81,6 @@ configure_flags_common = \ configure_flags_deb = \ --auto-features enabled \ -Dbroadway-backend=true \ - -Dcloudproviders=disabled \ -Dman-pages=true \ -Dx11-backend=true \ ${NULL} @@ -119,6 +118,11 @@ else configure_flags_deb += -Dinstall-tests=true endif +ifeq ($(shell dpkg-vendor --derives-from Ubuntu && echo yes), yes) +# Not in main repository +configure_flags_deb += -Dcloudproviders=disabled +endif + configure_flags_udeb = \ --auto-features disabled \ -Dbroadway-backend=false \ -- 2.30.2